merge emacs-23
authorKenichi Handa <handa@m17n.org>
Sat, 19 Feb 2011 02:24:09 +0000 (11:24 +0900)
committerKenichi Handa <handa@m17n.org>
Sat, 19 Feb 2011 02:24:09 +0000 (11:24 +0900)

Trivial merge